Merge from emacs-24; up to r111197
authorGlenn Morris <rgm@gnu.org>
Fri, 25 Jan 2013 04:41:39 +0000 (20:41 -0800)
committerGlenn Morris <rgm@gnu.org>
Fri, 25 Jan 2013 04:41:39 +0000 (20:41 -0800)
commit655093b55ddfa932c3009cc640d7ea4043bf3bae
tree25451c372701c0c3e7d0aeddd5f7333b596b23a0
parent66d15ad6e699a738f41e3e2c77b62e4072b364c6
parentbc10028755a1849d4daec1373c774106870c9f74
Merge from emacs-24; up to r111197
lisp/ChangeLog
lisp/imenu.el
lisp/profiler.el
lisp/progmodes/python.el
src/ChangeLog
src/coding.c
src/w32.c